[vtpm] Return a proper error when in the Xen-API call.

Fix a bug in the test.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>

diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py
index 9e5a8d0f69ea0717b3c8d9ad03b5a636bbadc47c..11d1f9b47039ac72dff3b215728b734a9da50127 100644 (file)
--- a/tools/python/xen/xend/XendAPI.py
+++ b/tools/python/xen/xend/XendAPI.py
@@ -2372,7 +2372,7 @@ class XendAPI(object):
         if not cfg:
             return xen_api_error(['HANDLE_INVALID', 'VTPM', vtpm_ref])
         if not cfg.has_key('backend'):
-            return xen_api_error(['VTPM backend not set'])
+            return xen_api_error(['INTERNAL_ERROR', 'VTPM backend not set'])
         return xen_api_success(cfg['backend'])
 
     def VTPM_get_VM(self, session, vtpm_ref):

diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
index 15775801f64b801ddca08909bde7a167b40d4475..5c8fb1188023090e94ccecb14182e8e782efab27 100644 (file)
--- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
+++ b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
@@ -91,7 +91,7 @@ if vtpm_uuid not in vm_vtpms:
 try:
     console = domain.start()
 except DomainError, e:
-    FAIL("Unable to create domain (%s)")
+    FAIL("Unable to create domain.")
 
 try:
     console.sendInput("input")